Skip to content

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Feb 1, 2022

There was an unintended regression in #17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix #18501

Signed-off-by: Andrew Thornton [email protected]

There was an unintended regression in go-gitea#17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix go-gitea#18501

Signed-off-by: Andrew Thornton <[email protected]>
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Feb 2, 2022
@6543
Copy link
Member

6543 commented Feb 2, 2022

some tests to not ensure regression again would be nice 😓

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 2, 2022
@6543 6543 merged commit 76e3111 into go-gitea:main Feb 2, 2022
zeripath added a commit to zeripath/gitea that referenced this pull request Feb 2, 2022
Backport go-gitea#18539

There was an unintended regression in go-gitea#17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix go-gitea#18501

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added the backport/done All backports for this PR have been created label Feb 2, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 2, 2022
* giteaofficial/main: (37 commits)
  Collaborator trust model should trust collaborators (go-gitea#18539)
  Detect conflicts with 3way merge (go-gitea#18536)
  [skip ci] Updated translations via Crowdin
  Update 1.16.0 changelog to set go-gitea#17846 as breaking (go-gitea#18533)
  In docker rootless use $GITEA_APP_INI if provided (go-gitea#18524)
  revert to node14 for snapcraft
  Add `GetUserTeams` (go-gitea#18499)
  Fix review excerpt (go-gitea#18502)
  Update JS dependencies, fix lint (go-gitea#18389)
  add test coverage for original author conversion during migrations (go-gitea#18506)
  add gitea-fmt back (go-gitea#18526)
  Fix non-ASCII search on database  (go-gitea#18437)
  Use "read" value for General Access (go-gitea#18496)
  Fix for AvatarURL database type (go-gitea#18487)
  Remove go 1.15 support (go-gitea#18511)
  [skip ci] Updated translations via Crowdin
  Use `ImagedProvider` for gplus oauth2 provider (go-gitea#18504)
  build with node16 in snap (go-gitea#18508)
  point to s3 endpoint directly (go-gitea#18497)
  Fix OAuth Source Edit Page (go-gitea#18495)
  ...
techknowlogick pushed a commit that referenced this pull request Feb 3, 2022
Backport #18539

There was an unintended regression in #17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix #18501

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: Lunny Xiao <[email protected]>
@zeripath zeripath deleted the fix-18501-trust-status-should-use-IsOwnerMemberCollaborator branch February 3, 2022 19:02
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
* Collaborator trust model should trust collaborators

There was an unintended regression in go-gitea#17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.

Fix go-gitea#18501

Signed-off-by: Andrew Thornton <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GPG signatures show as untrusted for non-admins
4 participants